Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 13 Jan 2010 22:04:10 +0000 (22:04 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 13 Jan 2010 22:04:10 +0000 (22:04 +0000)
commit65105d8503eef675e6c06abe5693ba0f23ea4679
tree32d2f15f536ba3570a40c88aba88bd8dd6393f9d
parentfa8127e52a4e92bccba80738174de3b4e00330e3
parent5b9c86e8f9b0cd7dc3f244b9a4d66f75bbab1a38
Merge from mainline.